Break when an item is found and activated. (#353449, based on a patch by

2006-08-29  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkrecentchoosermenu.c
	(gtk_recent_chooser_menu_set_current_item): Break when an item
	is found and activated. (#353449, based on a patch by Jan Arne
	Petersen)

diff --git a/ChangeLog b/ChangeLog
index 8f69e52d68160c431fe312cfb8e3920c53287ec4..48dc16b15dde42a9d784d7ef9d053dfa1fedecc3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-29  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkrecentchoosermenu.c
+       (gtk_recent_chooser_menu_set_current_item): Break when an item
+       is found and activated. (#353449, based on a patch by Jan Arne
+       Petersen)
+
 Fri Jul 14 16:13:37 2006  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkprogressbar.c: introduced ::xspacing and ::yspacing style 

diff --git a/gtk/gtkrecentchoosermenu.c b/gtk/gtkrecentchoosermenu.c
index 0e04b86575dd2c0c631302cb6770487953001253..9ad1cb10b4eb66648bd7c3fd1dcbabee0b34d7a1 100644 (file)
--- a/gtk/gtkrecentchoosermenu.c
+++ b/gtk/gtkrecentchoosermenu.c
@@ -411,8 +411,15 @@ gtk_recent_chooser_menu_set_current_uri (GtkRecentChooser  *chooser,
       if (!info)
         continue;
       
-      if (0 == strcmp (uri, gtk_recent_info_get_uri (info)))
-        found = TRUE;
+      if (strcmp (uri, gtk_recent_info_get_uri (info)) == 0)
+        {
+          gtk_menu_shell_activate_item (GTK_MENU_SHELL (menu),
+                                       menu_item,
+                                       TRUE);
+         found = TRUE;
+
+         break;
+       }
     }
 
   g_list_free (children);
@@ -423,14 +430,9 @@ gtk_recent_chooser_menu_set_current_uri (GtkRecentChooser  *chooser,
                   GTK_RECENT_CHOOSER_ERROR_NOT_FOUND,
                   _("No recently used resource found with URI `%s'"),
                   uri);
-      return FALSE;
-    }
-  else
-    {
-      gtk_menu_shell_activate_item (GTK_MENU_SHELL (menu), menu_item, TRUE);
-      
-      return TRUE;
     }
+  
+  return found;
 }
 
 static gchar *